[WIP] Adapt ongoing geoip upstream changes.#445
[WIP] Adapt ongoing geoip upstream changes.#445mashhurs wants to merge 2 commits intoelastic:mainfrom
Conversation
|
This pull request does not have a backport label. Could you fix it @mashhurs? 🙏
|
There was a problem hiding this comment.
There's some nuance with how we get the shaded dependencies lined up for this project, the new ingest-ip-location module, and the dependencies of the ip-location module (but maybe not the functionality from that module, since the ingest-ip-location provides an implementation of elasticsearch-ip-location-api for use with its database providers). But Logstash also provides those dependencies, although it may be a different version which is why we need the shading.
I'll need to validate it next week when my head has the room to think it through.
There was a problem hiding this comment.
| task shadeElasticsearchIpLocationModule(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { |
There was a problem hiding this comment.
Yep, properly renamed them now as my first very minimal change was to check the tests.
| dependsOn buildElasticsearchLocalDistro | ||
|
|
||
| from(buildElasticsearchLocalDistro.module("ingest-geoip").orElse(objects.fileCollection())) | ||
| from(buildElasticsearchLocalDistro.module("ip-location").orElse(objects.fileCollection())) |
There was a problem hiding this comment.
do we need everything, or can we get only the geoip dependencies?
There was a problem hiding this comment.
Yeah, as per my analysis (correct me if I am wrong), we need all (ip-location, ip-location-api and ingest-ip-location) need to exist in the JARs but we have to only shade the ip-location since others are references by the logstash-bridge:
IpLocationServiceAdapterfromingest-ip-location- no-op
IpLocationServicefromip-location-api
| @@ -472,6 +473,11 @@ task importMinimalElasticsearch() { | |||
| } | |||
|
|
|||
| from(shadeElasticsearchIngestGeoIpModule) | |||
There was a problem hiding this comment.
| from(shadeElasticsearchIngestGeoIpModule) | |
| from(shadeElasticsearchIpLocationModule) |
💚 Build Succeeded
History
|
3 participants
Pulls this elastic/elasticsearch#145011 PR changes and tests